updated keywords for most tools, fixed setup.py