Added angular comments, other updates