Fix a few bugs and add willingness filter to sally