corrections based on first beta tests