Tightening things up. more to come