fixed column ordering
added new steps for generating figures