Fixed some wrongly named column names etc.