More filename updates, and various cleanups in main.go.