some design and fixes
Merge pull request #65 from spyl94/design-improvements

some design and fixes