Fixed lots of issues.