Added better output, fixed some bugs, and updated to latest Rust master.