Help bugfix, manu generation run.
Clean up some done TODOs