cleaned minor bugs