Update specs and README
Final fixes