minor fixes changed

+ unused variables deleted
+ close #9