Add correct output logging, other text changes