Bugfixes and improvements to multi-axis