cleanup, config enhancements