Addressed a bunch of comments