Removing some cruft
Add some better descriptions for addon management