tighten
some tweaks to figure sizes