Some last adjustments to the codes