no more single letter vars
fixing references