Fixed some OS-specific paths, cleared out a few lines here and there