finishing more todo changes, finishing userguide, almost complete