finished adding devise
fixed bugs
bug fix