Fixed long lines and some mistakes