G2/G3 support, @execute command, smaller improvements