Minor tweaks

Plus, that thing where I teach @chilts how to properly count to 5.