cleaned up graph and fixed math for trip addition