implemented design review feedback batch 1

1, 2, 3.1, 3.2, 3.3