Housekeeping

Removed commented code that I missed, Changed some database entries to ints instead of strings for stability.
Changed the sql a bit to support "updates" from past databases to be a little nicer.