improve stuff
Get module into 1.0