Fixed crucial issues.