Updated documentation and configuration

Various small changes