added ipython notebook... slight changes to other funcs