more tweaks, python-centric