Better picture, other tweaks