Web Apps Machine Demo Update/Multiple Fixes

Web Apps Machine Demo Update/Multiple Fixes
#194
#192
#191
#189