Some minor changes to margin notes.
Fix bug which prevented optional argument to \footnote taking effect in margin note mode