minor cleanup and change log update