Fixed up some stuff. Marking is the obvious problem.