fix specs and bug fix