Comments and design doc changes