Add all the fixes from yesterday
Add specs