corrections based of the first beta tests