Corrected mistakes again due to comments