add verbose message for debuging and fix some issue