Mainly Outlook 2013 fixes.
Tidy up.