tweeked a few more things