Clean up buzzwords
Add buzzwords

Also sort them to throw off the history lol