squashed some bugs
some progress on play count incrementing
resolved conflict in js tests