Interim checkin; cleanup and documentation