partial review for const and final

I've been unable to run tests, so I'd love someone to take a look there.
Not -> nit