fixing #8 and #10, first round of pathing complete