slight cleanup of library/path names etc