Oops, forgot to merge my desktop repository with the Github repository l...

Oops, forgot to merge my desktop repository with the Github repository last night. Most of this is commenting and documentation.