Analysis updates & a little clean up.