Update to 0.3.5 -- fix bug involving incorrect timing on music play, clean up code