CLI: Finalize api-cli object mappings, plus several bug fixes