Add -s option to Python version. Fix more minor bugs.