Some minor things!

Few changes close to heart made all the work.