Adjusted comments and made several adjustments to some values