Minor changes for migration to full SQL, cleaning up files for implementation, typo cleanup