many design and stuff
Merge pull request #121 from spyl94/feat-many-design-improvements

many design and stuff