update to rust 0.11
clean up increments and a long line
clean up long lines, a useless variable, and poor pattern match