fixing more path stuff and grep
Merge branch 'develop'

* develop:
  fixing more path stuff and grep