v1.1 updates for AMO, plus detection of empty images.