Bug fixes and a hidden surprise.