jpa data bugfixing & cleanup