finished off the main bulk. tidy-up to go