Add demo mode #77, various minor fixes