Added comments to sets, ordered settings more logically.