Bug fixes, additions.