Develop

A few more tweaks to the MPD module.