Various updates and improvements