tightening up a few things