pulled in additional thrax tweaks