got settings working and cleaned up player creation
fixed some merge issues