better save + fixes