adjust to current ipython master shortcut style
some todos