Last couple of tweaks.

Remove pragma optimize off.
Slightly change the setup of the filenames to use std::string.
Should be all done and ready for review now.