update for Rust master; remove most s; bump version