more spec, some fixes