Small changes including changing to music buffer