updates to paths and minor fixes