* several fixes
* added new features
