Minor fixes and organising.