final fixes before demo