TODO:

	/	fix bugs as they appear
