cleaned up player & search code (mostly deleted duplicate stuff)