Fixed both commented issues.