Tweaked some mechanics