123123

12312
various bug fixes
additional bug fixes
Merge branch 'shashank-test' into richard-test
minor bug fixes