Updates to new phone alert code

Switch over to new phone alert code (somewhat improved compared
to the old code).  Made a few more updates and bugfixes.