Replaced some methods with iterator functions, added more music.