bug fixes before demo