Added tags to packages
Random lazy tweaks