Added refactor TODO flags and other small things