finished type return, before merge
before merge
fixed merge
fixed throw in CuStat.java
further fix in CuState.java