More corrections: newlines, ... + some tracks get new category