clean up and some more stuff