Tweaks and fixy (I hope)