Now playing bug fixed, optimisations