Tweak composer.json
Clean up, add docblocks and criteria to resolver