* clean up some code, add "mp3" short cut.