Update comments
Update variables