Fixed up a few things and said to include all packages