small corrections, missing imports etc