updated a bit of automatic sizing
Fixed emrge conflict