Made fixes based on Asheesh's feedback