Minor changes to comments.
Switching to H2, due to problems with HSQLDB.