Composer autoloader, fix phpdoc and a little controversial code