some bug fix and web console integration