Chris Heald:
	Tweak options a bit
