move [*] to [x], grammar fixes