* fix composer.json to make project installable via composer
* small code fixes