Small changes and improvements.