* merged daniel burrows fixes for the auto-mark code