Fixing some language issues, more could probably be done...