Add a Before Filter, Plus Other Minor Changes