Merge pull request #410 from way2muchnoise/1.7-update

bunch of fixes
puts some bucket code back in place now with registering to the bus

silly me forgot that last time