Fixed the resolution bug.. only cleanup left