Frames; more tidy up; fix typo.