minor improvements for "set up things"