cleanup and broadcast user entered fix