cleaning things up

mostly fixed path queueing issues