fixes to controller

	and all other classes
	Reviewed by: Simon