Tweaks

Tweaks to make sure that the code passes all IPython notebook tests.