mpd - cleanup and update stuff