fixed marking entering points; fixed order of wave points