Fixed bounding boxes and added rotations.
Merged.