removing http-header/title
adding more sorting, renaming some concepts