Changed parser to reflect new changes in spreadsheet. Also fixed small bug regarding ordering