Processed more comments. Should be almost done for v1.