Final changes & comments for demo.