Cleaned up some file identifiers, poked around various settings