#6 fixed a few specs and bugs