Hopefully I addressed Henri's comments. I also added a few "advanced" tests. I realized that there are a couple of other details to fix (coloring the signature lines and printing the appropriate register letter instead of always `v`), which I will do shortly.