various small changes due to xt issues
locally tested xt's for fun