Fix durations, fix imports, improve