Annotate, and a few tweaks