Tweaked some other things