A large chunk of modificatons that piled up durign the preparation of the pre-approval talk for Felix 

Check for individual commits.