added logging out and color
settling conflicts