• Small fixes and improvements