some more clean up
some specs