Revert "some minor bug fixes"

This reverts commit 0413ca506f29b69b6413b122fe76dcc87ca00dca.

stashed changes that shouldn't have been stashed
saving in case re-install of camera_umd messes up