fixes
log out
final fixes