simplify controls. add missing files