more cleanup work. need to separate input handler /and/or have separate
input handlers per-module