Clean house

I am cleaning the module here and fix a lot of issues.

Close #4 
Close #6 
Close #9