did some clean up and moved the values that were specific to the h2 database directory location to the h2 stuff
did some more cleanup