Major re-working various sections