Tweeked a few things