Bug fixes, improvements, test fixes.