add audio notification and minor code cleanup