Bug fixes, style changes.