Web Apps Machine Demo Update/Multiple FIxes

Web Apps Machine Demo Update/Multiple FIxes