Further improvements (and removed *.pyc files).