A few more changes to make compiling coffee sane...er.
more work on filters