Lots of fixes to player, new list and such