Add story points, fix some specs and other stuff