Fixed stills mode, with updated code from Raspi userland and some tidying