bug fixes, added PathUtil