cleanup and hacking away a type warning
patches need names, that's it
enum filter types, alternate Q calculation