fix some bugs in initial setup assistent