fixed some stuff ... need to sort out the various resolutions properly