Fixed #917
Fixed OCT-9
Updated some pathing stuff, hard code some.