add hello test back in; ease up on the grammar; support vars