inconsistent bolus functionality

Other t issues: