more imap fixes
more coherent imports