Minor code cleanup, rewrote music-dir selection so string do not grow larger than needed.