Specs fixed mostly
Minor changes