Improved save system

- World creation somewhat broken