Some minor things, fix#1

Few changes close to heart made all the work.
I wish there where more people like this in solar system.