A few more actions and filters
re: issue #8