Bug fixes, saving areas, more bug fixing