last fixes before demo