Changes following mpdreamz and costinl reviews