Get rid of NOVMODE and rename some variables