Better settings (still incomplete)