improved first run setup