update to 11.2 & minor cleanup.