quieting more warnings
Critic cleanups
Add some error checking and localize @files