Created by: eesaanatluri
This PR fixes bugs and issues encountered (refer to the issues section)
Merged by: rtripath89 at 2020-10-13 20:27:28 UTC