Bug fixes on smusher.py