Added rotations and some other niceities