Misc changes, getting composer.json up to date