Inequality in Wages and Self-Employment 1998-2015