improved PYTHONPATH management