imports and misc. fixes here and there