Started to correct all my comments