added comments and contract_type in db queries
replace vehicle with contract type
clean up
cleanup