fix several bugs; tweak a few transition names for greater clarity and consistency