Multiple bug fixes and code changes.