Documentation & Code Cleanup

Prior to this commit we did not have a whole lot of comments in the manifests.
This commit adds a few hours worth of comments and some minor code cleanup