Tweaked some things