Cleaned up / updated settings