error correction + more debug

Change-Id: I2ea546162b6150919c1f7fbcbff85ed9dc129f91