Modified files
Cleaned up some config code