Improvment 1000%

Fixes #34 #35 #31