Updated EMS

Updated to include many bug fixes.  Will test in server.