Some bug fixes.  Moving to Maria DB via new project.