minor changes after prototype presentation