various cbify improvements