more tweaking and stuff