fixed plural variable names, comments, bounds handling