XML comments added/fixed, refactored