More fixes for issue #122 and extra goodies.