tighten some things up