Small Unity Tweaks

I forgot to save unity before making the last comit. This will include
ALL of the latest.