Updated Database and minor fixes.