Update code and specs. Update README.