fixes in the annunciator, some did not work