Lots of minor changes, plus the glance image

Will add info later.