Fixed (hopefully) all the things you pointed out before

The three domain classes should be all cleaned up (though lacking javadoc for what that's worth).