Fix some bug and add report feature