improve important stuff
first major improvements
Merge pull request #1 from dardevelin/improvements

add first major improvements