swapped out some function... doc changes