last fixes for demonstration