Fixed all errors, updated PlayerMap