Minor changes made after testing, includes dbdelta