more changes

still to do: fit it to 12 pages, re-write conclusion