Fixed all sorts of collision shit