Fix typos + lighten load for 'on command' events