moving a few more small configs; added support for ML