Fixes a bunch of comments