* fixed missing version
* a little more refactoring