working on logging out
changes merged