Playlist Cleanup and Improvements

Should fix #285, also makes maintaining easier because it's a lot cleaner.