Added boxes, improved collision