fix bugs, create new entity and controllers, need repair some bugs