Added some minor comments, reviewed defender comments