Fix some report bug and port report to bootstrap
Fix some bug and Fix some style