add catmouse, bashcalc-fw edit