added player fnxs
fixed some merge conflicts
fixed more merge conflicts