New prosody version and some cleanups.