Fixes to updates, refactoring for some of the existing SQL, SQL for Other still needs to be added