closes #19 design corrections