Updated/improved comments.