Re-organize MagicKey() and fix GetCommentPrefix()
Add section markers