Fixes specs and latest comments on #33