Various changes to better support presentations.