Added settings, quick settings & lots of comments