Some comments and minor touch-ups
Working on some issues in the design with types and templates. (Descriptor, Engine)