Tweaks

Nothing major, just some slight tweeaks.