Various changes, reverting things and cleaning up.

But adding more to playlist--I'm going to recreate the playlistmanager pretty soon because it's too messy and has some design flaws. (Plus it doesn't even work.)