modified devise files forgotten earlier and some new changes