meine changed to eigene, more corrections and changes, closing #1889