label and vars fixes