improved setup to work from other directories than just ~