Corrected some errors on JPA, still working on it.