Web Apps Machine Demo Update/Multiple FIxes

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