Demo ready 6/13

small things changed in preparation for demo!