defects

also bug fixes
Merge branch 'master' into Saumya
Merge branch 'Saumya'