savestate update, closses issue #5