Cleaned up a few of the files, added local settings
Cleaned up a few of the files, added local settings