Bug fixes and initial data fix.