add some default hard constraints
fix bug in CalculatesServiceInsertion
refinements to incorporate pickup and deliveries