reworked map generation + added more logical classes to object classes