numerous fixes for Bill model/collection