Some edits + prep for packagist