small fixes and better playForever