Some optimization, aspect ratio fix.