code cleanup; add config items (fixed for now)