
Jean-Sebastien Valois: discussion and bugfixes.
Nicholas Chan: bugfixes.
