Fixed more minor and major language issues