Fixed saveload bug, but now new unexpected behaviour