Clean up config; rename; fix errors.