#33 | fix issues noted in design review