Finished rewrite of code, os.path.sep, minor