Some adjustments, new IPython version