Bug fixes, improvements.