change log info and small optimization fix