MOD: minor tweaks and improvements for rotation support