A bit more clarifications and TODO items in the documentation