fix path bugs

Hey man!  Merge this!