Update exception and comments, e_dumping and state setting works