All rewritten to be like NowPlaying. Small fixes.