I always felt awkward when playing this piece, until I bought the edition by Perlemuter (I got a Japanese translation, published from Ongaku-no-tomo sha). The score is full of detailed notes and fingering suggestions, and I felt finally every piece fit together. I didn't realize fingering makes so much difference before.