LIMBO: Improvements and minor bug fixes.

Improvements and minor bug fixes.