minor tweaks
more hax