Tweaked some more generation, added a structure and some new behaviors.