specs + fixes