Add some missed cases

Nowhere near complete, I still have a lot to add.
Remove Debug

Problem was in my configuration file, did not have table name correct.
Fixed Supress Warnings

I should probably refactor this better.