more tweaking to stuff