Bhome fixes

this includes commits from @bobsilverberg