Added player and fixed some stuff up