Syntax Cleanup

Cleaned up some syntax, fixed all errors to get project building. Also
added in support for a vector of column names for easier development
later.