Added/renamed handlers to match up with most of the new commands.
Finished/fixed several of the existing handlers.