Design

fixed issues #19 #11 
work on issues #9 #17