Cleaned up Mac Demo, reducing SLOC, clarifying, etc. Attempting to suash.