updated and fixed all specs