last up for the night, fixed a few bugs with collision