Aspect ratio correction and stability fixes