add some todos for future performance improvements that I can not do right now