fixed up keyboard control

and started fixing up the filter functionality