Lots of fixes for demo day