Devise working. Lots of minor changes