resolution fix and other things