Updating for latest Rust and fine-tuning