trimmed, fixes