Several changes, add packages, and more