change analyze implementation, minor fixes