Fixing slashes

My editor stripped some trailing whitespace so the diffs aren't that great.  I'm not sure how to get around that yet.