fix active player, file-naming and other fixes