High resolution fixes

Additional fixes and comments