fixing some bugs to run code properly
Merge branch 'sonal'