Various Updates

Made various small updates. Please see commits for details.