Added a TODO for the Settings and fixed a typo