Added code comments, minor validator class fix