Update comments here and there