Change some classes, fix the playtime sort