Update binary to print out description
Some major cleaning-up and extending