Organized settings and added a few...