Fix colors on fails and edit some stuff