Fixed issues.
Progress