Use inoremap instead of imap
Updated submodules