Add last play support + misc fixes