Fixed some final bugs for demo, more cleaning.