Outlined TODOs + corrected help-info (upload)