Typos
Replacing use of xml file by the use of a derby database