Requested fixes

this commit will be squashed, but this adds the TODO, converts the Text
to String, and also removes the unreliable onupdate function