map update and stuff,started to fix collision...its shittier now