Some minor things, fix#1

Few changes close to heart made all the work.
 This is a good addition to the metal era. Pay attention to details!