Some CodeOutput bugs fixed
Moving NewBase to Base