Add comments, change a few values