More documentation, TODO tweak.