Fixed issue with shifting centres caused by scaling without resetting
and added additional checks