cleanups and updates
mpd fix
update
update
update