huge improvements and bugs fixed in respect to saving