fixed language a bit
completing merge