Fix bugs and add chidoan detail