Edits from Mark, fixes to twitter (@) link