updates based on applicative programming and what will be mays paper

Fixes issue #88.