Some changes added, I missed some Steve Turczyn comments on my first week pull request.