More XML Comments + bug fixed + internal to publc