Add map and bindAll, and clean up specs