- Added rotation and indexing
- Fixed error messages