added devise, edited some shit