fixed some things
implemented some specs