Bug fixes, minor polish, minor changes.