fix limit calculation for cost limits; issue #553
Move date/time selection to dialog
minor fixes