Bug fixes and doctoring updates.