map builder improvements, first data persistence stuff