Refactor and refactor fix

oups, it wasn't consistent

also, the docstring "when this loads" is now obsolete
add some TODOs