added PersistenceContextType.EXTENDED to PersistenceContext
minor naming changes
cleanup