temp save + fixes