Fixed comments, added some annotations.