autoclean added plus various fixes