Fixed add-path & cleaned-up script a little