More markups - cleaning up resolved markups.
Leaves just need to verify pep8 and fix up one bug (default policy)
Previous markups introduced some typos. Fix them up so it works again.
PEP8 compliance markups.