move changes from bleeding edge to tavern

 @devoncarew @taped