add submodule for Cinder and cleanup paramters a bunch