fixes: a typo, a missed argument, and a (require 'cl) warning