Some changes/fixesTrying to solve