Fix issue #127 + a few other minor updates.