Design feedback changes, typo fixes