Make some output stuff better