fixing some of mark's stuff