Specs pass
Minor changes