Tidied up the playlist creation algorithm/code, removed some unused model attributes...