Command flow cleanup
Add support for manifests, general cleanup