Added list command, and general tweaks.