Several Small Tweaks