Fixed compilation, looks like I had missed a few changes. Also, removed nice picture