Completed, tested and revised comments