Edited a bunch of comments