More bugfixes, improved saving/loading data serialization.