Fixes rotation and adds some properties