reorganized a lot of stuff and modified mapgen and objects slightly while doing it