more tweaks on size and stuff