Adding editqueue command and some tweaks tu support it