more todo changes, not including userguide, will create new branch for that