Bugfixes

Corrected some bugs.
Added a few features to allow for more flexibility.
Fixed up some sanitization for certain columns.