Fixed some things for Dan