645 followups

@kcdragon, these are a few things I noticed post merge and decided to tweak.