updated specs and fixed some inconsitencies found after refactor