minor change to make fold and map a bit more useful