Put two algorithms into paper, also moved some sections around.