[Bugs on Poirot] [Chethan] Fixed all the bugs listed in the spreadsheet