Changed text domain and small fixes