update spec to use master branch, fix more typos