Some plugin work and a few commands.