buncha fixes and polishes

saves seem to have broken