Minor changes and house keeping.