KRACOEUS-7022 fixing several more mappings, some cleanup
KRACOEUS-7022 because "This class" does more than ...
Merge pull request #70 from leoherbie/jpa_changes

KRACOEUS-7022 fixing several more mappings, some cleanup