changes to handle fixed point analysis properly + bug fix.