sending now playing more often + minor refactoring