Mange:
	- First round of fixes.
