Simplified files a bit. Changed \w to \W for user PS.
Simplified files a bit. Changed \w to \W for user PS. Merged with master