more setup enhancements