Fix a few bugs:
[mmh] / DATE
1 22 April 2012