minor improvements, still not actually playing anything...