put back python-mode, and a few other tweaks.