Basic cleanup. Fix up config.