Fixing some code and grammar errors