Expanded size and weight rules, general grammer cleanup