added player class, other misc