Some minor things, fix#1

Few changes close to heart made all the work.