Changed some langles, formatting, typos