Resolution fixes + little changes