Added partial player matching and made proper getters/setters for variables