Adding Brigitte's improvements and restructuring the requirements chapter a bit