fixed collision and some other stuff