implemented design review feedback batch 2

3.4, 3.5, 3.6, 4.2