Routing set, Severity and hidden fields added, typos fixed, new todo tested