Some setup and documentation adjustments