cleanup, comments, and resolve (I hope!) column names and aliases