Changed some things with the contextual GABC editing