more set tweaking and stuff