Better define collision

Add vertical collision logic
better define collision boxes and general logic