some specs + some fixes