Use os.path.join as appropriate
Fix doc string
This can go now