More work on docs and the setup play