Fix some bugs, change column names