Label and outputed code improvements