Tweak reloading, clean up base command classes