Tweaked some small things