Updated a couple of commands based on feedback from Lichun.