Fixed some system and cosmetic bugs...