Feature freeze. Added comments.