fixed some typos
Merge branch 'jpa-working' into working