const is a virtue
Some TODO notes and junk removal