Add Settings and a few extra strings and TODOs