lots of small changes; a new plugin or two