Minor updates and improvements.