1212321

12313
Merge branch 'shashank-test'
Merge branch 'richard-test'
minor bug fixes, ui changes, and refactoring