minor cleanup and reorganization...
minor updates to documentation...