Comments added and a bug related to stripping tags presumably squashed