some cleanups, working on new playlist controller