Minor cleanup and corrections