Fixed bugs, remove comments, updated composer.json.