Fixed comments and EndRule