Updated a few more comments