Fixed bugs, passed imap general