overall tidy-up, added references