cleaning
some bug fixes