Fixed some language issues, still a lot to go though