Moved MetricState to its own file
Tuned limits to better defaults