Remaining changes per WG discussion

on 12/16/2014