Cleaning up old comments and adding some new ones.