fixed the bounding boxes and pieces not lining up.
fixed conflicts. Deletion of old stuff.

eddited conflicts.