fixed mass save bugs