Tweaked some stuff