Added performance TODO
Add more perf TODOs
Adjusting quotes which I know I would make inconsistent otherwise