Additional comments, fixed subject bug