Better numerical params
More features, fixed ESS calc