Updates and Comments are merged

Yup
I think I also did other things but I forgot
Ah well