Dealt with comments and made do_song default to True