Cleanup of startup a bit, marking NotInToc and draft where appropriate