Added some rubrics and fixed some mistakes.