Changed the way the default shell is changed and some hints