Fixed some problems with collisions. Bounding boxes currently w/ magic numbers.