More robustness, and some little bug fixes.