ran cleanup.py and fixed some errors. source: http://arxiv.org/abs/0903.5121 and http://arxiv.org/abs/0711.1746