Just a few fin(n)ishing touches

(Sorry, couldn't resist the pun.)

Should be ready to merge now.