Fix output, better system list, add many evil todos