bill fixes - john