Music + fixes