Merge pull request #389 from way2muchnoise/1.7-update

removes some unused bucket code + issue clean-ups
more fixes also closes #384