cleanup
reorganizing
synthesize paul's docs