Multiple fixes & cosmett