- fix BUGS
- code cleanup
- create better docummentation on usage