minor changes; fix Makevars