Finish fixing file names.
Add optimization status indicator