Adds some nice packages
More tweaks