Fixed review comments. Fixed found issues.