added more stuff
cleanup