Fix the configuration cludge
Update documentation