Minor GSM modifications and updates