fixed tests, fs->r, added w, updated docs, fixed .+ elsewhere