Fix filtering to be less dumb, fix more indentation, blah.