bit of cleanup in player... still ugly and unoptomized