Fix package dependencies
Final presentation clean up