Tweaked whitespace cropping + other small tweaks