add edit bus controller and fix bugs