Dotting I's, forking T's

Tying up a few loose ends.