Backup commit (not all tests pass). Fix more instructions. Add more tests.