Minor updates and improvements