Some Generation stuff and improvments

Hope this doesn't spam @PEMapModder email :smile:
This looks wrong...