Fixed bugs given in the google doc sheets