Added IDs to most objects
Refined JDO find loading