Minor issues, grammar update, new ForStatement test