sub plugin commands, multi file storage tweaks