Fixed up stuff and moved things about.