Minor improvements and fixes.