Added trimmed list indicators
General improvements