cleaned up Makevars
added declaration of global variables