Cleaning up, changed defaults (elastic.max, sic)