Benjamin Staneck:
	- cleanup, it actually works now \o/
	- fixes
