Map improvements
Move a few more things from old code to functional notebooks