Working with JPA... Submission works & general cleanup