changing RAnalInfos to RAnalState, cleaning up some other stuff