Fixed up a bunch of greeble behaviour