More changes to resolution independence (main comments on l.87 and l.90)