Add some packages
Fix everything