David Lynch:
	- Clean up some wording, and change where counts are incremented
	- Encoding
