updated TODO
some more uint safety