battle scars

Lots of small updates after experimenting in production.

Ride 'em, cowboy!