Wip/fix shortcuts

(unrelated to this patch but) shouldn't succeeded be set to the passed-in succeeded instead of always to true?