Added inner and border update functions (untested)
Fixed checking in load from saved state