Fix up SQL to workingish state
More fixes
WHY U NO SAVE PROPERLY?