Added rubric capacity, hard coded (line) numbering for comments