Some changes + logout