Morsk:
	- Tested, works with 4.2.
	- clarify a comment
	- cleanup
