Some markup cleanups post FPWD
Merge pull request #39 from jasnell/markupcleanuppostfpwd

Some markup cleanups post FPWD