path changes and minor error fixes