added setup/teardown functions
updates to ui.
Merge remote branch 'origin/master'