Camera working, updated collision

Camera is working 100% as far as I can tell, I've also updated the
collision system.