some cosmetic fixes and a skill